moving some function in from HydroBasement