rounding out core feature set