Some random changes - getting ZF to work