Second Commit / September 26/13

First Commit since the original! Updated lots of stuff, including UI
logic, and flow of the code.