Added trainer, and views