Code now compiles and started adding tests