Moved parsing to models, added Docs