Added a bunch of stuffs, finishign up parse to be cleann cleann cleann