A little restructuring, added the 'me' command.