exporting everything for the moment
added accessors, cleaned up data structures, made machine a 'per session' setting