WIP on agular demo. Fixes to the build system