Fixed all the entities finally! Woot. Also started on the Matches stack with the controller and views