Make some things public
More sain sorting