Added modules, added timer, added argument parser, fixed bugs