011.03 Cleanup and some new data type experiments. Look for ++++