1st Commit

Mostly done.