Partial commit. Need to work on the embedded resource