Some nice changes, almost there