trying to get more logic down