Moved to ye olde own class file.