Move marks down to state
Move generic named history down to the state
Remove conf from manager