Finished challenge 2 and organized things a bit.