Minor logic changes (e.g. thunk one method to another) but a lot of