Added modules, added amalgamation