First commit
Somewhat functional
merged