Checking in file for safety.
Added tests, less shit makefile