Type Parsing

Progress on type parsing