Some work on some stuff... Cue bad commit logs