Still trying to make it less buggy...