diff --git a/src/binaryfile/binaryfile.h b/src/binaryfile/binaryfile.h
index 87b02dd..17c8d7a 100644
--- a/src/binaryfile/binaryfile.h
+++ b/src/binaryfile/binaryfile.h
@@ -9,12 +9,11 @@ public:
     BinaryFile(QByteArray data = QByteArray());
     void setData(QByteArray data);
 
-    quint16 length() { return m_length; }
+    virtual quint16 length() { return m_length; }
 
     void dump();
 
 protected:
-    quint16 m_length;
 };
 
 #endif // BINARYFILE_H
diff --git a/src/binaryfile/binaryfilemetadata.cpp b/src/binaryfile/binaryfilemetadata.cpp
index 5fd99d7..51f98c2 100644
--- a/src/binaryfile/binaryfilemetadata.cpp
+++ b/src/binaryfile/binaryfilemetadata.cpp
@@ -1,4 +1,7 @@
 #include "binaryfilemetadata.h"
+#include <QFile>
+#include <QDataStream>
+#include <QDebug>
 
 BinaryFileMetadata::BinaryFileMetadata(GenericFile *file, quint16 defaultAddress, QObject *parent)
     : QObject(parent)
@@ -14,14 +17,32 @@ BinaryFileMetadata::BinaryFileMetadata(GenericFile *file, quint16 defaultAddress
 
 void BinaryFileMetadata::load()
 {
-    EntryPoint ep;
-    ep.note = "Default Entry Point";
-    ep.address = m_defaultAddress;
-    m_eps->addPoint(ep);
+    QFile infile(QString("%1%2").arg(m_file->filename()).arg(".bfm"));
+    if (infile.open(QIODevice::ReadOnly))
+    {
+        qDebug() << "Loading binary file metadata from" << QString("%1%2").arg(m_file->filename()).arg(".bfm");
+        QDataStream ds(&infile);
+        ds >> *m_eps;
+        ds >> *m_as;
+        infile.close();
+    }
+    else qDebug() << "Cannot open " << QString("%1%2").arg(m_file->filename()).arg(".bfm") << "for reading";
+
 }
 
 void BinaryFileMetadata::save()
 {
+    QFile infile(QString("%1%2").arg(m_file->filename()).arg(".bfm"));
+    if (infile.open(QIODevice::WriteOnly))
+    {
+        qDebug() << "Saving binary file metadata to" << QString("%1%2").arg(m_file->filename()).arg(".bfm");
+        QDataStream ds(&infile);
+        ds << *m_eps;
+        ds << *m_as;
+        infile.close();
+    }
+    else qDebug() << "Cannot open " << QString("%1%2").arg(m_file->filename()).arg(".bfm") << "for writing";
+
 }
 
 
diff --git a/src/binaryfile/disassembler.cxx b/src/binaryfile/disassembler.cxx
index 58cbfaa..849e8a5 100644
--- a/src/binaryfile/disassembler.cxx
+++ b/src/binaryfile/disassembler.cxx
@@ -10,7 +10,9 @@ Disassembler::Disassembler(QByteArray memimage)
     m_memusagemap.clearData();
 }
 
-QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,bool processRecursively) {
+QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,
+                                                  QList<quint16> entryPoints,
+                                                  bool processRecursively) {
     QList<DisassembledItem> retval;
     qDebug() << "Disassemble: From"<<uint16ToHex(from)<<"to"<<uint16ToHex(to);
     //#define OLDDISSEM
@@ -32,6 +34,11 @@ QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,bool
 
     bool stopping = false;
     quint16 next = from;
+    if (entryPoints.count())
+    {
+        next = entryPoints.takeFirst();
+        m_jumps.append(entryPoints);
+    }
 
     while (!stopping)
     {
@@ -100,7 +107,7 @@ QList<DisassembledItem> Disassembler::disassemble(quint16 from, quint16 to,bool
             if (num >= from && num <= to) // TODO: remove this to not limit disassembly to program range
             {
                 qDebug() << "Calling recursively to"<<uint16ToHex(num);
-                retval.append(disassemble(num,to,false));
+                retval.append(disassemble(from,to,QList<quint16>() << num,false));
                 qDebug() << "Return from recursive call.";
             }
         }
diff --git a/src/binaryfile/disassembler.h b/src/binaryfile/disassembler.h
index b9fd136..bdbf332 100644
--- a/src/binaryfile/disassembler.h
+++ b/src/binaryfile/disassembler.h
@@ -145,7 +145,10 @@ public:
         P65C02
     };
 
-    QList<DisassembledItem> disassemble(quint16 from, quint16 to,bool processRecursively = true);
+    QList<DisassembledItem> disassemble(quint16 from,
+                                        quint16 to,
+                                        QList<quint16> entryPoints,
+                                        bool processRecursively = true);
 
     MemoryUsageMap *memoryUsageMap() { return &m_memusagemap; }
 
diff --git a/src/diskfiles/dos33/genericfile.cxx b/src/diskfiles/dos33/genericfile.cxx
index 88814ca..5bb9727 100644
--- a/src/diskfiles/dos33/genericfile.cxx
+++ b/src/diskfiles/dos33/genericfile.cxx
@@ -6,9 +6,11 @@ GenericFile::GenericFile(QByteArray data)
         setData(data);
     }
     m_address = 0x00;
+    m_length = 0x00;
 }
 
 void GenericFile::setData(QByteArray data)
 {
     m_data = data;
+    m_length = data.size();
 }
diff --git a/src/diskfiles/dos33/genericfile.h b/src/diskfiles/dos33/genericfile.h
index 0fd1806..e7ea832 100644
--- a/src/diskfiles/dos33/genericfile.h
+++ b/src/diskfiles/dos33/genericfile.h
@@ -18,10 +18,15 @@ public:
     virtual quint16 address() { return m_address; }
     virtual QByteArray rawData() { return m_data; }
 
+    virtual void setLength(quint16 length) { m_length = length; }
+    virtual quint16 length() { return m_length; }
+
+
 protected:
     QByteArray m_data;
     QString m_filename;
     quint16 m_address;
+    qint16 m_length;
 
 };
 
diff --git a/src/relocatablefile/relocatablefile.h b/src/relocatablefile/relocatablefile.h
index 71adfc9..81b6e91 100644
--- a/src/relocatablefile/relocatablefile.h
+++ b/src/relocatablefile/relocatablefile.h
@@ -81,7 +81,7 @@ public:
     RelocatableFile(QByteArray data = QByteArray());
     void setData(QByteArray data);
 
-    quint16 length() { return m_data.length(); }
+    virtual quint16 length() { return m_data.length(); }
 
     void dump();
 
diff --git a/src/ui/viewers/disassemblerviewer.cpp b/src/ui/viewers/disassemblerviewer.cpp
index 11adf15..6007763 100644
--- a/src/ui/viewers/disassemblerviewer.cpp
+++ b/src/ui/viewers/disassemblerviewer.cpp
@@ -73,7 +73,12 @@ void DisassemblerViewer::setFile(BinaryFile *file) {
 
     quint16 address = file->address();
 
-    QStringList formattedLines = getDisassemblyStrings(address);
+    m_mem.addFile(m_file->data(), address);
+
+    QList<quint16> addresses = m_bfm->entryPoints()->getEntryPointAddresses();
+    if (!addresses.count()) { addresses.append(address); }
+    QStringList formattedLines = getDisassemblyStrings(addresses);
+
     QByteArray joinedlines = qPrintable(formattedLines.join("\n"));
     setData(joinedlines);
 }
@@ -91,7 +96,11 @@ void DisassemblerViewer::setFile(RelocatableFile *file) {
 
     quint16 address = file->address() + 6 ; // Handle offset for relocatable metadata
 
-    QStringList formattedLines = getDisassemblyStrings(address);
+    m_mem.addFile(m_file->data(), address);
+
+    QList<quint16> addresses = m_bfm->entryPoints()->getEntryPointAddresses();
+    if (!addresses.count()) { addresses.append(address); }
+    QStringList formattedLines = getDisassemblyStrings(addresses);
 
     QByteArray joinedlines = qPrintable(formattedLines.join("\n"));
     QStringList rd = file->decodeRelocatableDict();
@@ -102,10 +111,9 @@ void DisassemblerViewer::setFile(RelocatableFile *file) {
 void DisassemblerViewer::handleDisassembleRequest(QList<quint16> addresses)
 {
     QStringList strings;
-    foreach (quint16 addr, addresses)
-    {
-        strings += getDisassemblyStrings(addr);
-    }
+
+    strings += getDisassemblyStrings(addresses);
+
     qSort(strings);
     strings.removeDuplicates();
 
@@ -126,23 +134,15 @@ void DisassemblerViewer::handleDisassembleRequest(QList<quint16> addresses)
 }
 
 
-QStringList DisassemblerViewer::getDisassemblyStrings(quint16 address) {
-    Memory mem;
-    mem.addFile(m_file->data(), address);
-    Disassembler dis(mem.values());
+QStringList DisassemblerViewer::getDisassemblyStrings(QList<quint16> entryPoints) {
 
-    int length = 0;
-    if (dynamic_cast<BinaryFile*>(m_file))
-    {
-        length = (dynamic_cast<BinaryFile*>(m_file))->length();
-    }
-    else
-    {
-        length = m_file->rawData().size();
-    }
+    Disassembler dis(m_mem.values());
+
+    int length = m_file->length();
 
     QList<DisassembledItem> lines = dis.disassemble(m_file->address(),
-                                                    m_file->address()+length);
+                                                    m_file->address()+length,
+                                                    entryPoints);
     dis.setUnknownToData(m_file->address(),m_file->address()+length);
 
     QStringList formattedLines;
@@ -162,14 +162,14 @@ QStringList DisassemblerViewer::getDisassemblyStrings(quint16 address) {
         formattedLines.append(newline);
     }
 
-    for (int idx = address; idx < address+length; idx++)
+    for (int idx = m_file->address(); idx < m_file->address()+length; idx++)
     {
         if (dis.memoryUsageMap()->at(idx).testFlag(Data))
         {
             QString newline = QString("%1:  %2           %3 (%4)").arg(uint16ToHex(idx))
-                    .arg(uint8ToHex(mem.at(idx)))
-                    .arg(makeDescriptorStringForVal(mem.at(idx)))
-                    .arg(dis.getMnemonicForOp(mem.at(idx)));
+                    .arg(uint8ToHex(m_mem.at(idx)))
+                    .arg(makeDescriptorStringForVal(m_mem.at(idx)))
+                    .arg(dis.getMnemonicForOp(m_mem.at(idx)));
             formattedLines.append(newline);
         }
     }
diff --git a/src/ui/viewers/disassemblerviewer.h b/src/ui/viewers/disassemblerviewer.h
index 4fa0fba..ffc3a8e 100644
--- a/src/ui/viewers/disassemblerviewer.h
+++ b/src/ui/viewers/disassemblerviewer.h
@@ -4,6 +4,7 @@
 #include <QWidget>
 #include <QByteArray>
 
+#include "memory.h"
 #include "binaryfile.h"
 #include "relocatablefile.h"
 #include "fileviewerinterface.h"
@@ -33,7 +34,7 @@ public:
 
     QString makeDescriptorStringForVal(quint8 val);
 
-    QStringList getDisassemblyStrings(quint16 address);
+    QStringList getDisassemblyStrings(QList<quint16> entryPoints);
 
 public slots:
     void setFile(GenericFile *file);
@@ -55,6 +56,7 @@ private:
 
     BinaryFileMetadata *m_bfm;
 
+    Memory m_mem;
 
     bool m_isRelo;
 };
diff --git a/src/ui/widgets/DisassemblerMetadataDialog.cpp b/src/ui/widgets/DisassemblerMetadataDialog.cpp
index cd4b4a7..ff3549c 100644
--- a/src/ui/widgets/DisassemblerMetadataDialog.cpp
+++ b/src/ui/widgets/DisassemblerMetadataDialog.cpp
@@ -52,6 +52,7 @@ void DisassemblerMetadataDialog::handleCancelButton()
 
 void DisassemblerMetadataDialog::handleExitButton()
 {
+    m_bfm->save();
     this->close();
 }