A bit more progress! Still WIP but it is going on!