Hetani 3.2

Possibly finished. Might change the file tomorrow; will probably find lots of errors once my eyes are rested.