First step towards modularity
Correct frametype markers bug