Finalize the draft

Draft is now ready re-submitted. Still expect some errors though.