working out the last kinks