Generator Repair

WIP

Work in progress :)