Nice reorganization of functions. And stuff. :)