added some more primitive stuff