added some more skeleton/outline code