Refactored
Tests passing
Working ERB views