Continued development on Xots processing. Improved class hierarchy and extensibility
Merge remote-tracking branch 'origin/nathan' into jesse