Dev: Everything working in a single app