Add more common fns and abstract out some old ones.