tables updated to have more meaningful names
Merge branch 'develop' into chardin
added some code to try and get chardin to work on demand