Added smooth scrolling capability...cleaned up most of the testing code