Refactored, implemented butterfly movement