routes reworked; js refactored; data coming through