merged with vincent's stuff, still missing the exercise