Craig's Changes

Added the scrollview stuff