This could use a test!