Finished adding utility files