WIP app major overhaul