First cut prior to adjusting internal implementation