Adding unit testing, changing (slightly) criteria due to compile problems
Adding new files