sorted out more IDE stuff
updated files
removed test_route
Merge branch 'working_set'