Initial import of latest code. Use at your own risk!