Update for release
Start moving some functions to utility.c