We probably want more robust handling, but this is a start