WIP commit; 0.93