Moved generic funcs to funcs.el