working through non-cleanup & cleanup messiness. tests currently FAIL.