fix things
finish test for now