Added new classes and started adding other threads