Substantial work towards #14 but there are still 3 warnings from the Rails Best Practices gem