Added in basic scaffoling