Cleaned up imports.
Added current-user.
Added compact map.
Added recursive compact-map.
Adapter draft.