Entering second refactor (Elm has been updated)
Still in second refactor
Added new refactored file.
Removed old file
Finished refactor