More WIP notes