Cleaned up dupe & pre, added group command