Started framework and copied in some of last year's code