Initial Commit

Committing everything from last weekend