In progress

Formatting, clean up, good times.