few changes. still not quite there