rebuild propel, and simplified the router