more WIP, reset stuff done (minus tests)