still fixing crap