Functions

Figure we could go ahead and merge with dev on this.