Put this in its own file and change it up a bit