Made completion a bit more generic. Dunno if it'll work yet

God damn this keyboard sucks. Pushing this now so I can work on my
laptop