Initial Commit

Commit of the parts I've been working on. It doesn't work yet.