Working on updating the code to work with Cake3