Cleaned up work so far in Problem1