Tests! Taking pictures!

Last commit of new code. Going to comment it up and refactor some stuff.