Stable working version

About to try to change to a manual collection view