Refactoring
Implemented Lightning classes