Initial commit, mostly wip