Trainers and stuff

Adding these things in this branch too.