big batch of commit

use most of files from codeclubAU