added some more basic code