Feature/parse

Bring parsing into the Master plan.