added two files, bunch of changes