Marks fine

Works with mark updating fine. But needs some refactoring and shit-code
removal. Later :)