some cleanup from work
working towards finalizing the datamodels
still working on model structure, should be done by the end of the week
Merge branch 'joe' into memstoremodel

getting joe's IO commits
fixed indentation for joe, using 4 spaces instead of tabs. however we are not doing a line cap as suggested before due to the hideous appearance of some of the code
fixed singleton