Cleaned up some more, BOOL to only share on web