Final additions to 3.0a

On to testing....