A few more little things before the hard part