Bug fixing beggins