Started working on auto-complete... Still messy and hard-coded