Bug fixing will begin at this point