Mostly codcommenting/restructuring

Also sliding now works