Retried combining the app, added my own class and fixed multiple redundancies