Reminder to move logic to client