Make base routines private
More stuff