Some stuff working now ...