Added basic annotation functionality to project