diff --git a/Core/src/ThreadWin32.cpp b/Core/src/ThreadWin32.cpp
new file mode 100755
index 0000000..be2a2a1
--- /dev/null
+++ b/Core/src/ThreadWin32.cpp
@@ -0,0 +1,290 @@
+/* FasTC
+ * Copyright (c) 2013 University of North Carolina at Chapel Hill.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for educational, research, and non-profit purposes, without
+ * fee, and without a written agreement is hereby granted, provided that the
+ * above copyright notice, this paragraph, and the following four paragraphs
+ * appear in all copies.
+ *
+ * Permission to incorporate this software into commercial products may be
+ * obtained by contacting the authors or the Office of Technology Development
+ * at the University of North Carolina at Chapel Hill <otd@unc.edu>.
+ *
+ * This software program and documentation are copyrighted by the University of
+ * North Carolina at Chapel Hill. The software program and documentation are
+ * supplied "as is," without any accompanying services from the University of
+ * North Carolina at Chapel Hill or the authors. The University of North
+ * Carolina at Chapel Hill and the authors do not warrant that the operation of
+ * the program will be uninterrupted or error-free. The end-user understands
+ * that the program was developed for research purposes and is advised not to
+ * rely exclusively on the program for any reason.
+ *
+ * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE
+ * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL,
+ * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF
+ * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA
+ * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY
+ * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY 
+ * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON
+ * AN "AS IS" BASIS, AND THE UNIVERSITY  OF NORTH CAROLINA AT CHAPEL HILL AND
+ * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, 
+ * ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Please send all BUG REPORTS to <pavel@cs.unc.edu>.
+ *
+ * The authors may be contacted via:
+ *
+ * Pavel Krajcevski
+ * Dept of Computer Science
+ * 201 S Columbia St
+ * Frederick P. Brooks, Jr. Computer Science Bldg
+ * Chapel Hill, NC 27599-3175
+ * USA
+ * 
+ * <http://gamma.cs.unc.edu/FasTC/>
+ */
+
+#include "Thread.h"
+
+#include <assert.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <tchar.h>
+#include <strsafe.h>
+
+void ErrorHandler(LPTSTR lpszFunction) 
+{ 
+  // Retrieve the system error message for the last-error code.
+  LPVOID lpMsgBuf;
+  LPVOID lpDisplayBuf;
+  DWORD dw = GetLastError(); 
+
+  FormatMessage(
+    FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+    FORMAT_MESSAGE_FROM_SYSTEM |
+    FORMAT_MESSAGE_IGNORE_INSERTS,
+    NULL,
+    dw,
+    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+    (LPTSTR) &lpMsgBuf,
+    0, NULL );
+
+  // Display the error message.
+  lpDisplayBuf = (LPVOID)LocalAlloc(LMEM_ZEROINIT, 
+  (lstrlen((LPCTSTR) lpMsgBuf) + lstrlen((LPCTSTR) lpszFunction) + 40) * sizeof(TCHAR)); 
+  StringCchPrintf((LPTSTR)lpDisplayBuf, 
+    LocalSize(lpDisplayBuf) / sizeof(TCHAR),
+    TEXT("%s failed with error %d: %s"), 
+    lpszFunction, dw, lpMsgBuf); 
+  MessageBox(NULL, (LPCTSTR) lpDisplayBuf, TEXT("Error"), MB_OK); 
+
+  // Free error-handling buffer allocations.
+  LocalFree(lpMsgBuf);
+  LocalFree(lpDisplayBuf);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Thread Implementation
+//
+////////////////////////////////////////////////////////////////////////////////
+
+class TCThreadImpl : public TCThreadBaseImpl {
+private:
+  static DWORD WINAPI RunThread(LPVOID arg) {
+    TCThreadImpl *impl = (TCThreadImpl *)arg;
+    impl->m_Callable();
+    return 0;
+  }
+
+  HANDLE m_ThreadID;
+  TCCallable &m_Callable;
+
+public:
+  TCThreadImpl(TCCallable &callable) :
+    m_Callable(callable)
+  {
+    m_ThreadID = CreateThread(NULL, 0, RunThread, (void *)this, 0, 0);
+    if(m_ThreadID == NULL) {
+      ErrorHandler("CreateThread");
+    }
+  }
+  virtual ~TCThreadImpl() { }
+
+  void Join() {
+    DWORD result = WaitForSingleObject(m_ThreadID, INFINITE);
+    if(result == WAIT_FAILED) {
+      ErrorHandler("WaitForSingleObject");
+    }
+  }
+};
+
+class TCThreadImplFactory : public TCThreadBaseImplFactory {
+  TCCallable &m_Callable;
+public:
+  TCThreadImplFactory(TCCallable &callable) : m_Callable(callable) { }
+  virtual ~TCThreadImplFactory() { }
+  virtual TCThreadBaseImpl *CreateImpl() const {
+    return new TCThreadImpl(m_Callable);
+  }
+};
+
+TCThread::TCThread(TCCallable &callable)
+  : TCThreadBase(TCThreadImplFactory(callable))
+{ }
+
+void TCThread::Join() {
+  CheckReferenceCount();
+  ((TCThreadImpl *)m_Impl)->Join();
+}
+
+// !HACK! wtf, Microsoft?
+#undef Yield
+void TCThread::Yield() {
+  if(!SwitchToThread()) {
+    ErrorHandler("SwitchToThread");
+  }
+}
+
+uint64 TCThread::ThreadID() {
+  return static_cast<uint64>(GetCurrentThreadId());
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Mutex Implementation
+//
+////////////////////////////////////////////////////////////////////////////////
+
+class TCMutexImpl : public TCThreadBaseImpl {
+private:
+  CRITICAL_SECTION m_CS;
+
+public:
+  LPCRITICAL_SECTION GetMutex() { return &m_CS; }
+  TCMutexImpl() : TCThreadBaseImpl() {
+    InitializeCriticalSection( &m_CS );
+  }
+
+  virtual ~TCMutexImpl() { 
+    DeleteCriticalSection( &m_CS );
+  }
+
+};
+
+class TCMutexImplFactory : public TCThreadBaseImplFactory {
+public:
+  TCMutexImplFactory() { }
+  virtual ~TCMutexImplFactory() { }
+  virtual TCThreadBaseImpl *CreateImpl() const {
+    return new TCMutexImpl();
+  }
+};
+
+TCMutex::TCMutex() : TCThreadBase(TCMutexImplFactory())
+{ }
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Lock Implementation
+//
+////////////////////////////////////////////////////////////////////////////////
+
+class TCLockImpl : public TCThreadBaseImpl {
+private:
+  LPCRITICAL_SECTION const m_CSPtr;
+  // Disallow copy and assign...
+  TCLockImpl(const TCLockImpl &) : m_CSPtr(NULL) { }
+  TCLockImpl &operator =(const TCLockImpl &) { return *this; }
+public:
+  TCLockImpl(TCMutex &mutex)
+    : m_CSPtr(((TCMutexImpl *)(mutex.m_Impl))->GetMutex()) { 
+    EnterCriticalSection( m_CSPtr );
+  }
+
+  virtual ~TCLockImpl() { LeaveCriticalSection( m_CSPtr ); }
+  LPCRITICAL_SECTION GetMutexPtr() const { return m_CSPtr; }
+};
+
+class TCLockImplFactory : public TCThreadBaseImplFactory {
+private:
+  TCMutex &m_Mutex;
+public:
+  TCLockImplFactory(TCMutex &mutex) : m_Mutex(mutex){ }
+  virtual ~TCLockImplFactory() { }
+  virtual TCThreadBaseImpl *CreateImpl() const {
+    return new TCLockImpl(m_Mutex);
+  }
+};
+
+TCLock::TCLock(TCMutex &mutex) : TCThreadBase(TCLockImplFactory(mutex))
+{ }
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Condition Variable Implementation
+//
+////////////////////////////////////////////////////////////////////////////////
+
+class TCConditionVariableImpl : public TCThreadBaseImpl {
+private:
+  CONDITION_VARIABLE m_CV;
+public:
+  TCConditionVariableImpl() { InitializeConditionVariable( &m_CV ); }
+  virtual ~TCConditionVariableImpl() { 
+    // No destroy condition variable...?
+  }
+
+  void Wait(TCLock &lock) {
+    TCLockImpl *lockImpl = (TCLockImpl *)(lock.m_Impl);
+    
+    BOOL result = SleepConditionVariableCS( &m_CV, lockImpl->GetMutexPtr(), INFINITE );
+    if(!result) {
+      ErrorHandler( "SleepConditionVariableCS" );
+    }
+  }
+
+  void NotifyOne() { WakeConditionVariable( &m_CV ); }
+  void NotifyAll() { WakeAllConditionVariable( &m_CV ); }
+};
+
+class TCConditionVariableImplFactory : public TCThreadBaseImplFactory {
+public:
+  TCConditionVariableImplFactory() { }
+  virtual ~TCConditionVariableImplFactory() { }
+  virtual TCThreadBaseImpl *CreateImpl() const {
+    return new TCConditionVariableImpl();
+  }
+};
+
+TCConditionVariable::TCConditionVariable()
+  : TCThreadBase(TCConditionVariableImplFactory())
+{ }
+
+void TCConditionVariable::Wait(TCLock &lock) {
+  CheckReferenceCount();
+
+  TCConditionVariableImpl *impl = (TCConditionVariableImpl *)m_Impl;
+  impl->Wait(lock);
+}
+
+void TCConditionVariable::NotifyOne() {
+  CheckReferenceCount();
+
+  TCConditionVariableImpl *impl = (TCConditionVariableImpl *)m_Impl;
+  impl->NotifyOne();
+}
+
+void TCConditionVariable::NotifyAll() {
+  CheckReferenceCount();
+
+  TCConditionVariableImpl *impl = (TCConditionVariableImpl *)m_Impl;
+  impl->NotifyAll();
+}