Started refactor of code. https://app.asana.com/0/19128794071848/21140848412800