Add threads and such