I really like your proposed modifications - nice work. I think you're on the right track and I'm excited to play your final product!