Almost converted the main app into a spec