4 of 4 unit tests working, just the main part remaining