Merge working draft from "broken" branch