Reformatted functions
TODO: Change services to be temp image in filesystem based, rather than lots of objects in memory
Revert "Reformatted functions"

This reverts commit 0731a7e334a65c17a75d3ff3f4079b01a9dd6756.