Trying to do this properly