created new() methods where needed, replaced throw, rearrange as needed