Added some redirection. Partial functionality but can't continue working on it right now.