Mostly fixded need to do other stuff