Much needed commit

I haven't pushed code for this in 17 days. Lots of progress.