js not working right yet, cleaned up frontend, still more to go