Refactor
Refactored and working bondlab