FIX ALL THE BUGS