This seems to be a well thought out solution