Second Commit

More functionality and a bit of design. Still some to go…