Updates with fixes for the system. Now to do some more testing with RSpec and Cucumber