added a whole bunch of stuff, still on the first step