WIP: squash 6

WIP: squash 7

WIP: squash 8

WIP: squash 9

WIP: squash 10

WIP: squash 11, please