pretty close to working with everything, pushing before I start messing around with extras!