Closes #13 - Gift Type. Closes #14 - account changes