Seems like doing that would solve most problems here.