Not completely polished; kept things commented out that I may want to revisit.
Merge branch 'master' of https://github.com/KNMeredith/OCDAP