prototyping changes made
Merge branch 'hiw2' of https://github.com/evansda/fictiv into hiw2