route me working
Fixed conflicts
code clean up
code cleanup 2
Merge pull request #19 from mikejuyoon/justin-working

route me working. code cleanup