Better tokens
Complete system call
still some cleanup to do