First Commit

Needs cleanup