Clean App to OOP - add Wave detection -> reload feature