work on #105 milestone 2