Fixed bugs

Nearly at full operation now just need to add in concurrency to allow
multiple interactions to take place at once