Flortd dev code review

FLOR D - completed unit/integration/qual testing.  Ready for review.