Working on a more eloquent solution