final commit before crashing...3am :p