First edit that is mostly happy! y ay