diff --git a/Cargo.lock b/Cargo.lock
index 229d19e..32970db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,22 +1,25 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "aligned"
-version = "0.3.2"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1ce8b3382016136ab1d31a1b5ce807144f8b7eb2d5f16b2108f0f07edceb94"
+checksum = "3a785a543aea40f5e4e2e93bb2655d31bc21bb391fff65697150973e383f16bb"
 dependencies = [
  "as-slice",
 ]
 
 [[package]]
 name = "as-slice"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37dfb65bc03b2bc85ee827004f14a6817e04160e3b1a28931986a666a9290e70"
+checksum = "45403b49e3954a4b8428a0ac21a4b7afadccf92bfd96273f1a58cd4812496ae0"
 dependencies = [
- "generic-array 0.12.3",
- "generic-array 0.13.2",
+ "generic-array 0.12.4",
+ "generic-array 0.13.3",
+ "generic-array 0.14.5",
  "stable_deref_trait",
 ]
 
@@ -26,48 +29,68 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
 dependencies = [
- "rustc_version",
+ "rustc_version 0.2.3",
 ]
 
+[[package]]
+name = "bitfield"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
+
 [[package]]
 name = "byteorder"
-version = "1.3.4"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cast"
-version = "0.2.3"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
+checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
 dependencies = [
- "rustc_version",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "0.1.10"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cortex-m"
-version = "0.6.2"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2954942fbbdd49996704e6f048ce57567c3e1a4e2dc59b41ae9fde06a01fc763"
+checksum = "9075300b07c6a56263b9b582c214d0ff037b00d45ec9fde1cc711490c56f1bb9"
 dependencies = [
  "aligned",
  "bare-metal",
+ "bitfield",
+ "cortex-m 0.7.4",
+ "volatile-register",
+]
+
+[[package]]
+name = "cortex-m"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37ff967e867ca14eba0c34ac25cd71ea98c678e741e3915d923999bb2fe7c826"
+dependencies = [
+ "bare-metal",
+ "bitfield",
+ "embedded-hal",
  "volatile-register",
 ]
 
 [[package]]
 name = "cortex-m-rt"
-version = "0.6.12"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d518da72bba39496024b62607c1d8e37bcece44b2536664f1132a73a499a28"
+checksum = "454f278bf469e2de0a4d22ea019d169d8944f86957c8207a39e3f66c32be2fc6"
 dependencies = [
- "cortex-m-rt-macros",
+ "cortex-m-rt-macros 0.6.15",
  "r0",
 ]
 
@@ -82,43 +105,73 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "cortex-m-rt-macros"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3aa52243e26f5922fa522b0814019e0c98fc567e2756d715dce7ad7a81f49"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "cortex-m-semihosting"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "113ef0ecffee2b62b58f9380f4469099b30e9f9cbee2804771b4203ba1762cfa"
+checksum = "6bffa6c1454368a6aa4811ae60964c38e6996d397ff8095a8b9211b1c1f749bc"
 dependencies = [
- "cortex-m",
+ "cortex-m 0.7.4",
+]
+
+[[package]]
+name = "cortex-m-semihosting"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c23234600452033cc77e4b761e740e02d2c4168e11dbf36ab14a0f58973592b0"
+dependencies = [
+ "cortex-m 0.7.4",
 ]
 
 [[package]]
 name = "embedded-hal"
-version = "0.2.3"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4908a155094da7723c2d60d617b820061e3b4efcc3d9e293d206a5a76c170b"
+checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff"
 dependencies = [
- "nb",
+ "nb 0.1.3",
  "void",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
+checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
 dependencies = [
  "typenum",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed1e761351b56f54eb9dcd0cfaca9fd0daecf93918e1cfc01c8a3d26ee7adcd"
+checksum = "f797e67af32588215eaaab8327027ee8e71b9dd0b2b26996aedf20c030fce309"
 dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "generic-array"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "hash32"
 version = "0.1.1"
@@ -130,12 +183,12 @@ dependencies = [
 
 [[package]]
 name = "heapless"
-version = "0.5.4"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ffa511365b12346c5fbe759d82f80d3aa70d9f1ba01955594f84a1a6bbab985"
+checksum = "74911a68a1658cfcfb61bc0ccfbd536e3b6e906f8c2f7883ee50157e3e2184f1"
 dependencies = [
  "as-slice",
- "generic-array 0.13.2",
+ "generic-array 0.13.3",
  "hash32",
  "serde",
  "stable_deref_trait",
@@ -144,7 +197,7 @@ dependencies = [
 [[package]]
 name = "lc3-baseline-sim"
 version = "0.1.0"
-source = "git+https://github.com/ut-utp//prototype?branch=staging#2bf05ae7d548ef503c1773f493cee5525db6e2e6"
+source = "git+https://github.com/ut-utp//prototype?branch=master#1e9a83d39fdaa630b988108749f55d26e8134ac3"
 dependencies = [
  "lc3-isa",
  "lc3-macros",
@@ -155,12 +208,12 @@ dependencies = [
 [[package]]
 name = "lc3-device-support"
 version = "0.1.0"
-source = "git+https://github.com/ut-utp//prototype?branch=staging#2bf05ae7d548ef503c1773f493cee5525db6e2e6"
+source = "git+https://github.com/ut-utp//prototype?branch=master#1e9a83d39fdaa630b988108749f55d26e8134ac3"
 dependencies = [
  "embedded-hal",
  "lc3-isa",
  "lc3-traits",
- "nb",
+ "nb 0.1.3",
  "postcard",
  "serde",
  "static_assertions",
@@ -169,7 +222,7 @@ dependencies = [
 [[package]]
 name = "lc3-isa"
 version = "0.1.0"
-source = "git+https://github.com/ut-utp//prototype?branch=staging#2bf05ae7d548ef503c1773f493cee5525db6e2e6"
+source = "git+https://github.com/ut-utp//prototype?branch=master#1e9a83d39fdaa630b988108749f55d26e8134ac3"
 dependencies = [
  "lc3-macros",
  "serde",
@@ -179,7 +232,7 @@ dependencies = [
 [[package]]
 name = "lc3-macros"
 version = "0.1.0"
-source = "git+https://github.com/ut-utp//prototype?branch=staging#2bf05ae7d548ef503c1773f493cee5525db6e2e6"
+source = "git+https://github.com/ut-utp//prototype?branch=master#1e9a83d39fdaa630b988108749f55d26e8134ac3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -189,17 +242,17 @@ dependencies = [
 [[package]]
 name = "lc3-tm4c"
 version = "0.1.0"
-source = "git+https://github.com/ut-utp/tm4c?branch=feat-non-generic#67308058926a04ca83427e2063d845cc502263fb"
+source = "git+https://github.com/ut-utp/tm4c?rev=b1c2dcb445965124918e7bbbd3be0af8589d76a9#b1c2dcb445965124918e7bbbd3be0af8589d76a9"
 dependencies = [
- "cortex-m",
+ "cortex-m 0.6.7",
  "cortex-m-rt",
- "cortex-m-rt-macros",
- "cortex-m-semihosting",
+ "cortex-m-rt-macros 0.1.8",
+ "cortex-m-semihosting 0.3.7",
  "embedded-hal",
  "lc3-baseline-sim",
  "lc3-isa",
  "lc3-traits",
- "nb",
+ "nb 0.1.3",
  "panic-halt",
  "tm4c123x",
  "tm4c123x-hal",
@@ -208,7 +261,7 @@ dependencies = [
 [[package]]
 name = "lc3-traits"
 version = "0.1.0"
-source = "git+https://github.com/ut-utp//prototype?branch=staging#2bf05ae7d548ef503c1773f493cee5525db6e2e6"
+source = "git+https://github.com/ut-utp//prototype?branch=master#1e9a83d39fdaa630b988108749f55d26e8134ac3"
 dependencies = [
  "lc3-isa",
  "lc3-macros",
@@ -219,18 +272,27 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.8"
+version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "nb"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1411551beb3c11dedfb0a90a0fa256b47d28b9ec2cdff34c25a2fa59e45dbdc"
+checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f"
+dependencies = [
+ "nb 1.0.0",
+]
+
+[[package]]
+name = "nb"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae"
 
 [[package]]
 name = "panic-halt"
@@ -240,9 +302,9 @@ checksum = "de96540e0ebde571dc55c73d60ef407c653844e6f9a1e2fdbd40c07b9252d812"
 
 [[package]]
 name = "postcard"
-version = "0.5.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ba083a6a640a9f09d294c0f504acdd7a2b000c179e80c73d4b7a036bfd8164"
+checksum = "8a9ba0d1b66f31fb374fede892eb4b0818ea819d5e7bc587345ce50a6949e782"
 dependencies = [
  "heapless",
  "postcard-cobs",
@@ -257,18 +319,18 @@ checksum = "7c68cb38ed13fd7bc9dd5db8f165b7c8d9c1a315104083a2b10f11354c2af97f"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.10"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.4"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
  "proc-macro2",
 ]
@@ -285,7 +347,16 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "semver",
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver 1.0.9",
 ]
 
 [[package]]
@@ -297,6 +368,12 @@ dependencies = [
  "semver-parser",
 ]
 
+[[package]]
+name = "semver"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
+
 [[package]]
 name = "semver-parser"
 version = "0.7.0"
@@ -305,18 +382,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.106"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399"
+checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.106"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c"
+checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -325,9 +402,9 @@ dependencies = [
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "static_assertions"
@@ -337,13 +414,13 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "syn"
-version = "1.0.18"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213"
+checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942"
 dependencies = [
  "proc-macro2",
  "quote",
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -352,9 +429,9 @@ version = "0.3.0"
 source = "git+https://github.com/ut-utp/tm4c-hal?rev=f4f7487202c7b777c6d2092cd6504f8d4c638ede#f4f7487202c7b777c6d2092cd6504f8d4c638ede"
 dependencies = [
  "cast",
- "cortex-m",
+ "cortex-m 0.6.7",
  "embedded-hal",
- "nb",
+ "nb 0.1.3",
 ]
 
 [[package]]
@@ -364,7 +441,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "097e7f60cc69f25d9bd189509c682b36057fd5f1519e6485b107aecca15c3e3f"
 dependencies = [
  "bare-metal",
- "cortex-m",
+ "cortex-m 0.6.7",
  "cortex-m-rt",
  "vcell",
 ]
@@ -375,9 +452,9 @@ version = "0.10.0"
 source = "git+https://github.com/ut-utp/tm4c-hal?rev=f4f7487202c7b777c6d2092cd6504f8d4c638ede#f4f7487202c7b777c6d2092cd6504f8d4c638ede"
 dependencies = [
  "cast",
- "cortex-m",
+ "cortex-m 0.6.7",
  "embedded-hal",
- "nb",
+ "nb 0.1.3",
  "tm4c-hal",
  "tm4c123x",
  "void",
@@ -385,22 +462,22 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.12.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
-name = "unicode-xid"
-version = "0.2.0"
+name = "unicode-ident"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
 
 [[package]]
 name = "utp-tm4c"
 version = "0.1.0"
 dependencies = [
  "cortex-m-rt",
- "cortex-m-semihosting",
+ "cortex-m-semihosting 0.5.0",
  "embedded-hal",
  "lc3-baseline-sim",
  "lc3-device-support",
@@ -414,9 +491,15 @@ dependencies = [
 
 [[package]]
 name = "vcell"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876e32dcadfe563a4289e994f7cb391197f362b6315dc45e8ba4aa6f564a4b3c"
+checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "void"
@@ -426,9 +509,9 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "volatile-register"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d67cb4616d99b940db1d6bd28844ff97108b498a6ca850e5b6191a532063286"
+checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6"
 dependencies = [
  "vcell",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index bcbe8f7..5f0f984 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,23 +12,28 @@ edition = "2018"
 # TODO: lints and attributes for this crate
 
 [dependencies]
-cortex-m-rt = {version = "0.6.10", features = ["device"]}
-cortex-m-semihosting = "0.3.3"
+# cortex-m-rt = { version = "0.7.1", features = ["device"] }
+cortex-m-rt = { version = "0.6.15", features = ["device"] }
+cortex-m-semihosting = "0.5.0"
 panic-halt = "0.2.0"
 # panic-semihosting = "0.5.3"
 
 # TODO: All of the below should use crates.io published version instead of git repos.
-lc3-device-support = { git = "https://github.com/ut-utp/prototype.git", branch = "staging", version = "0.1.0", default-features = false, features = ["no_std"]}
-lc3-baseline-sim = { git = "https://github.com/ut-utp/prototype.git", branch = "staging", version = "0.1.0", default-features = false, features = ["no_std"] }
-lc3-isa = { git = "https://github.com/ut-utp/prototype.git", branch = "staging", version = "0.1.0", default-features = false, features = ["no_std"] }
-lc3-traits = { git = "https://github.com/ut-utp/prototype.git", branch = "staging", version = "0.1.0", default-features = false, features = ["no_std"]  }
+lc3-device-support = { git = "https://github.com/ut-utp/prototype.git", version = "0.1.0", default-features = false, features = ["no_std"] }
+lc3-baseline-sim = { git = "https://github.com/ut-utp/prototype.git", version = "0.1.0", default-features = false, features = ["no_std"] }
+lc3-isa = { git = "https://github.com/ut-utp/prototype.git", version = "0.1.0", default-features = false, features = ["no_std"] }
+lc3-traits = { git = "https://github.com/ut-utp/prototype.git", version = "0.1.0", default-features = false, features = ["no_std"]  }
 
 # tm4c123x-hal = { version = "0.9.0", features = ["rt"] }
-tm4c123x-hal = { git = "https://github.com/ut-utp/tm4c-hal", version= "0.10.0" , features=["rt"], rev="f4f7487202c7b777c6d2092cd6504f8d4c638ede"}
+tm4c123x-hal = { git = "https://github.com/ut-utp/tm4c-hal", version= "0.10.0" , features=["rt"], rev="f4f7487202c7b777c6d2092cd6504f8d4c638ede" }
 tm4c123x = "0.9.0"
-embedded-hal = "0.2.3"
+embedded-hal = "0.2.7"
 
-lc3-tm4c = { git = "https://github.com/ut-utp/tm4c", branch = "feat-non-generic"}
+lc3-tm4c = { git = "https://github.com/ut-utp/tm4c", rev = "b1c2dcb445965124918e7bbbd3be0af8589d76a9" }
+
+[profile.dev]
+lto = true
+opt-level = 1 # need this so we fit in flash!
 
 [profile.release]
 codegen-units = 1 # better optimizations
@@ -41,12 +46,16 @@ lto = true # better optimizations
 # https://github.com/rust-lang/cargo/issues/5478
 #
 # 'lc3-tm4c' has not updated yet..
+#
+# have to change the source so we do this silly workaround (note the two slashes)
 [patch."https://github.com/ut-utp/prototype.git"]
-lc3-isa = { git = "https://github.com/ut-utp//prototype", branch = "staging", version = "0.1.0", default-features = false, features = ["no_std"] }
-lc3-traits = { git = "https://github.com/ut-utp//prototype", branch = "staging", version = "0.1.0", default-features = false, features = ["no_std"]  }
-lc3-baseline-sim = { git = "https://github.com/ut-utp//prototype", branch = "staging", version = "0.1.0", default-features = false, features = ["no_std"] }
-lc3-device-support = { git = "https://github.com/ut-utp//prototype", branch = "staging", version = "0.1.0", default-features = false, features = ["no_std"]}
+lc3-isa = { git = "https://github.com/ut-utp//prototype", branch = "master", version = "0.1.0" }
+lc3-traits = { git = "https://github.com/ut-utp//prototype", branch = "master", version = "0.1.0" }
+lc3-baseline-sim = { git = "https://github.com/ut-utp//prototype", branch = "master", version = "0.1.0" }
+lc3-device-support = { git = "https://github.com/ut-utp//prototype", branch = "master", version = "0.1.0" }
 
+# [patch.crates-io]
+# cortex-m-rt = { git = "https://github.com/rust-embedded/cortex-m.git", rev = "0.7.1", version = "0.7.1" }
 
 # [replace]
 # "lc3-isa:0.1.0" = { git = "https://github.com/ut-utp/prototype.git#staging"}