Work in progress and package updates.