Put everything in a single file, added parsing