Clean slate for rebuild with BDD - wip

Going to attempt to start over, this time driving the development
with BDD via rspec and maybe cucumber...