Multiple elastic keys... clean-up / version

Still needs work