Second commit

Needs work on parser