Added evening commit of partly broken code