infinate scroll
fixed merge conflicts
cleaned up merge again
fixed merge conflicts