equation updates

About to go in a different direction to support multiple column numbers