Added forms and functions.
Updated formatting.
Added a TBD comment.
Split up testing sections.