Initial commit: no tests
Cleanup of backup files
Merged in github defaults after conflict