 cmd.command('log <project> <task> [time] [note]')
     .description('Create a stopped timer for a given task. Shortcut: l')
     .action (project, task, time, note) ->
-        taskString = project
-        matches = taskString.match /^@?([^@])+@([^@])$/
-        if matches
-            taskString = matches[1] + "." + matches[0]
-        if taskString.match /\./
+        taskString = parseTask project, task
+        if project.match /\./
             note = time
             time = task
-        else
-            taskString += "." + task
 
         commands.log taskString, time, note
 

        when 'projects' then 'project'
        when 'users' then 'user'
        else input


# Init/Setup

    .option('-n, --negative', 'Indicate that the number is negative')
    .action (entry, task, note, program) ->
        index = parseInt(entry)
        if not isNaN index
            index *= -1 if program.negative?
        else
            index = parseTask entry, task
            if entry.match /\./
                note = task

        commands.resume index, note

