[WIP] For review purposes only... Fix block device mappings

Oh wait, you are using assignment...I never liked that...makes the code hard confusing.