Progress on #6

Made some minor changes to #4