WIP for the new way of doing things
Added more debugging