I definitely need to redo the final