Added some stuff
First attempt at concurrency