Added and removed a couple of TODOs
ui-matrix is now sets its focused card to the selectedCard