Real setup and blocking

Fixed setup to include all training sessions. Started revamping block
order, but still needs to be fixed