Even more fiddling... (WIP)