(WIP) More work...