Partialresolve

Hopefully this is all the changes that are going to go into 0.5.0