Closes #73 (closed). Will work further in #71 (closed) since this also means that I have to touch the constructors....