trying to fix things
trying to put things where they go