made changes getting basic working