Doing stuf for initial release, still need Graphics