Cleaned up through delivery, working on contact