Merged Viktors files into project