Duplication of code started, some test files, added libraries