WIP fixing js, model, view, router