Added external/tap/sync, but need to fix some errors in there