WIP cleanup - API runs, merge test site with API site
WIP - routing broken