Continued work turning switches into sense

Most functionality is player independent now and will check which player
it is associated with from a central location