Square 1! Rewriting, modularly(Is that a word) :P

Going to make the code more readable. Also Javadocs!