Added all files from BETA 1.1