Initial SlimKat changes