Moved occurences over to common and added to GameplayInterfaceListener
More stuff draws.  It also crashes on launch again.  :(