Removed some proposed but for now, extraneous features - maybe they'll be back later