SKELET-2 Adding in the extras from panweb.