Cleaned Up basic routing