Rest of the work i've done