Some more work/restructering/removing...