added new files, handlers, made work