Moved some files around, modified the 'messages' file. This may need more tweaking.