Updates Docblocks
Renames Pieces to be More Presentation Agnostic