Initial, VERY MESSY commit. (Please be gentle)