FW-312. Fix.

ringmaster implementation, would like to code review before merging