New feature files, work in progress. Committing so I can work on this code on another machine.