started re-working the redirects/messages