currently working, most recently  updated through merges.. mofos