- rewriting to be a base app instead to extend through own pages/ app
Merge branch 'base-rewrite'