working on testing features
fixing things