Updates

and stuff

Ready for uiscrollview hookups