added some files, main handler finished