Cleaning up.  Adding auto-complete
Merge with master
Merge master