prepped for auth & updated namespacing