Made Finishable take 2 type parameters

The value between More and Done should be able to very in a type safe way.