Added handling for the name field
Dumb mistake
Undid something
Fixed if tree
Temp fix
Rewrote page labelling