WIP more progress