more autcomplete stuff
Merge branch 'new-arch' into development