Done fiddling w. demo app