Working post RIDS refactor, many features need fixing and improving still.