Major cleanup in routes. Added functionality for entries