diff --git a/priorityqueue/heap/HeapPriorityQueue.java b/priorityqueue/heap/HeapPriorityQueue.java
new file mode 100644
index 0000000..3038628
--- /dev/null
+++ b/priorityqueue/heap/HeapPriorityQueue.java
@@ -0,0 +1,146 @@
+package priorityqueue.heap;
+import exceptions.EmptyPriorityQueueException;
+import position.Position;
+import priorityqueue.Entry;
+import priorityqueue.PriorityQueue;
+import tree.binarytree.heap.ArrayListCompleteBinaryTree;
+import tree.binarytree.heap.CompleteBinaryTree;
+import utility.DefaultComparator;
+
+import java.security.InvalidKeyException;
+import java.util.Comparator;
+
+
+public class HeapPriorityQueue<K,V> implements PriorityQueue<K,V> {
+
+  protected CompleteBinaryTree<Entry<K,V>> heap;
+  protected Comparator<K> comp;
+
+
+  protected static class  MyEntry<K,V> implements Entry<K,V> {
+    protected K key;
+    protected V value;
+    public MyEntry(K k, V v) { key = k; value = v; }
+    public K getKey() { return key; }
+    public V getValue() { return value; }
+    public String toString() { return "(" + key  + "," + value + ")"; }
+  }
+
+
+  public HeapPriorityQueue() {  
+    heap = new ArrayListCompleteBinaryTree<Entry<K,V>>();
+    comp = new DefaultComparator<K>();
+  }
+
+  public HeapPriorityQueue(Comparator<K> c) {
+    heap = new ArrayListCompleteBinaryTree<Entry<K,V>>();
+    comp = c;
+  }
+
+    //elementi gia' ordinati
+  public HeapPriorityQueue (K k[], V v[], Comparator<K> C){
+      heap = new ArrayListCompleteBinaryTree<Entry<K,V>>();
+      comp = C;
+
+      if ( k == null || v == null || v.length != k.length ){
+
+      } else {
+
+          for (int i = 0; i < k.length; i++) {
+               heap.add(new MyEntry<K, V>(k[i],v[i])); // gia' ordinati. evitiamo l'upheap
+          }
+      }
+
+  }
+
+  public void setComparator(Comparator<K> c) throws IllegalStateException {
+    if(!isEmpty())
+      throw new IllegalStateException("Priority queue is not empty");
+    comp = c;
+  }
+
+  public int size() { return heap.size(); } 
+
+  public boolean isEmpty() { return heap.size() == 0; }
+
+  public Entry<K,V> min() throws EmptyPriorityQueueException {
+    if (isEmpty()) 
+      throw new EmptyPriorityQueueException("Priority queue is empty");
+    return heap.root().element();
+  }
+
+
+  public Entry<K,V> insert(K k, V x) throws InvalidKeyException {
+    checkKey(k);
+    Entry<K,V> entry = new MyEntry<K,V>(k,x);
+    upHeap(heap.add(entry));
+    return entry;
+  }
+
+
+
+  public Entry<K,V> removeMin() throws EmptyPriorityQueueException {
+    if (isEmpty()) 
+      throw new EmptyPriorityQueueException("Priority queue is empty");
+    Entry<K,V> min = heap.root().element();
+    if (size() == 1)
+      heap.remove();
+    else {
+      heap.replace(heap.root(), heap.remove());
+      downHeap(heap.root());
+    }
+    return min;
+  }
+
+
+
+
+  protected void checkKey(K key) throws InvalidKeyException {
+    try {
+      comp.compare(key,key);
+    }
+    catch(Exception e) {
+      throw new InvalidKeyException("Invalid key");
+    }
+  }
+
+
+  protected void upHeap(Position<Entry<K,V>> v) {
+    Position<Entry<K,V>> u;
+    while (!heap.isRoot(v)) {
+      u = heap.parent(v);
+      if (comp.compare(u.element().getKey(), v.element().getKey()) <= 0) break;
+      swap(u, v);
+      v = u;
+    }
+  }
+
+  protected void downHeap(Position<Entry<K,V>> r) {
+    while (heap.isInternal(r)) {
+      Position<Entry<K,V>> s;
+      if (!heap.hasRight(r))
+	    s = heap.left(r);
+      else if (comp.compare(heap.left(r).element().getKey(), heap.right(r).element().getKey()) <=0)
+	            s = heap.left(r);
+            else
+	            s = heap.right(r);
+      if (comp.compare(s.element().getKey(), r.element().getKey()) < 0) {
+	    swap(r, s);
+	    r = s;
+      }
+      else 
+	    break;
+    }
+  }
+
+  protected void swap(Position<Entry<K,V>> x, Position<Entry<K,V>> y) {
+    Entry<K,V> temp = x.element();
+    heap.replace(x, y.element());
+    heap.replace(y, temp);
+  }
+
+  public String toString() {
+    return heap.toString();
+  }
+
+}