Further stuff done
Finished first draft