Probably saving too much now...?!
Not using custom types
Updated test