Parser Working

Needs more formatting