Add mark manager
Implement marks. Fixes #31