Added underscores to markup parser class variables.
Added a todo.
Removed cruft.
Removed cruft.
Removed cruft, added save functions.