Started work on better namespacing