Casts2

Is it ok to merge this into master now ?