ok back to something more manageable...
cleanup attempt 1