Refactoring
Still refactoring
Kick added