refactoring to version 1.8 + make it routeable #coderwall