Need to add unit tests so we can more easily see what's broken
Need to add unit tests so we can more easily see what's broken