Make some things public (?)