Initial submitted version of 1b on Courseweb

Will most likely resubmit once we finish fixing 1a.