Added files, updated indents
Added events to class