Cleaned up the type parser
Added wrappers for the types, added tuple parsing
Finished the type parser