2nd commit | nearly done