Updating modified code. Not compiling quite yet.