Units in storage

This implements #75