better remove the CVS stuff at some point