Pull function out, update project, add new utility function