Less hacky. More workey.