Working commit. @madpond, @antisober552: ....