Update to have init use underscore functions