Changing up the design and committing what I have so far