Added a bunch of User Stories(ish) things - probably warrants further discussion