More logic migrated to knockout