merged with sam's changes
re-integrated shitty autocompletion
Merge branch 'editor' into live
random commit