WIP: Adding drill

Conflicts:
	cli/pom.xml
	pom.xml