Weeks 3-4 done! Minor refatoring of w 3-4