Add type signatures
Started Parser, a bit of cleanup