Get a bit of logic in place