I should read all the code before commenting on stuff :)