Finished conversion to hpp