almost works commit before messing everything up