The great v1.5 refactor (Stage 2)