Upon applying the changes 1 and 3 you suggested, this seems to be a reasonable solution to start from. At the end of the day we need some degree of accountability. Currently we have practically none.