Full conversion to header implementation