Really wishing I did better with tests...