WIP: Trying to be clever (and probably breaking things instead :p).