Moving this to completed, even though it still requires a lot of small tweaks. Functional enough.