adding in stuff that wasn't checked in - need to revisit and clean up...