Pushing somewhat working code, to overwrite crap code