Second commit, did a shit ton of stuff, Immediately before inital test