more progress on cardbox branch