A little work on cleaning things up.
Added type parsing.

Note needs latest iteration of star compiler