fixed merge conflicts from new UI
merging trivial conflicts
started writing click handler
added database storage for enablement
merged
selection and such. Highlighting.
merging
Merge pull request #14 from brain-murphy/brian-branch

Brian branch