Added parser, cleaned, and more