almost done? thinking about what i can add to this