Reverted from initializer lists, included makefile. Missing output and some tests