Reworked constructors, passes all tests