still fixing things up