Commit 4

Finished general structure