VERY-WIP: Some more progress