I have no idea what changed
conflicts and shit
Finish demo app