More work on crime stuff