Work in Progress

I am working on this and so I'm just uploading this to be safe for now.
It's not "working", but I have a lot to do. I'll update you all when it
works.