Adding in logic...