Overhaul the key:val accessing & some referencing