First big commit with lots of stuff. Working locally