WIP commit; vers. 0.84