First Commit

Commiting everything I have so far, mainly for Nolan to catch up...