Changes before move to SlideView

Just a backup for before I replace the core files.