FSM mixin 

This also includes the gamesaves branch