Add unit

Units are now created inside the relevant object so all data stays in context.