Pretty final some bugs still remain