Made some changes on the two memory part. A little more work left to be done.