added Int case, but going to move everything around (again) anyway