Initial commit; code copied from the base package