Starting on field aliasing (failing tests!)
Refactor
Aliasing fields
Rename
Rename
Added build