Further dev work