continued development on the Elastic Module and support classes