Moving everything to toJSON