Base: More progress towards a working app