KIBANA-1 : Initial work