Commit two. Finishing the basics of the code, seems to work. On to the finishing touches.