First turn-in ready version

Needs to be checked.