Everything done still some bugs