Splited apart some bookmark code

This is WIP on #96 as the code for handling the data is very similar
Mork WIP on #96