checkpoint
Squashed commit of the following:

commit f3c9119a983e3b6d5290dc5d71a59577412d553e
Author: Todd Geist <todd@geistinteractive.com>
Date:   Sun Jun 1 18:36:20 2014 -0700

    another major redo