more progress
refactor