New commit, cleaned up some code and worked a little on the design