improved ALOT of the drill code, but still isnt meta data friendly! :/