Rehash of old code. Cleanup and remove cross calls