More compact option stuff with lambdas. Yay, I found a use for those pretty fast.