Started refactoring, changed the thing with the custom FindItems to use core.GetItem