testing out
Merge branch 'master' into spike-structure
wip
implement some ai