changed; mostly everything - work in progress