WIP: Misc partial things...