WIP: Huge overhaul. min app works!