initial commit (from early wip)