TODO: Finish adding zip support.