aep-31
Merge pull request #32 from refocus-studios/aep-31

#31 - Updates in route to Issue 31 completion