Better definitions view.
Merge branch 'master' of https://github.com/SoapSeller/MidWorx
updated TODO