Merge pull request #17 from n3world/recapWork

Track user parts
Update command parsing so it can handle quotes and extra white space