Second commit of the awfullness!

Yeah!