Fix shit - get rid of the dumb swinger stuff