More SM integration - Working out an abilities fetch hickup and then should be done