checkin with working stuff before more refactoring
broken at the moment
content_for causing duplicate renders