a lot of stuff done, I'm sorry for not being atomic
interactive fixes, new empty packages, a new test