Work on draft, add info