more work on this, added google stuff