Some progress... further attempts to fix functionality