Pretty big commit. Lots of stuff added. New resources etc.