Moving contact into Nav

Taking a completely different approach