Update to use functions for creating things, removed functions we aren't using