Did some more testing in main