changed the structure of things... started to add some cucumber tests