Added everything except views