Made some tests pass, turned the constructor into an arrayList