Completely redoing class to work with BitBucket