CVS was not written to be user friendly. I think I finally found the way to track sources that I get from a remote repository and put them into my local repository. Hopefully I have, otherwise I've wasted some these past few hours that could have gone to some precious sleep.

Right now it's looking good. I won't know until I try to commit what I did a couple of nights ago along with the changes that the Psi team has done. I should sleep well.