Is there a reason we are duplicating this code in two files? There has to be a way to re-use this, no?