Reorganized code, recreated some stuff, created working app