Minor pushing of logic out of Static controller and into Entry model