better environ handling in bake file
lots or reorganization
routes and tests for almost everything