Safety Commit

just saving some code for Backtracker and Player that aren't fully
implemented but that I also don't want to lose.