Created lightning and updated a few classes