Refactor to use Basestar