Switched to dlls. Cleaned up a bit