progress made. still several broken tests