Add field access checking. Still convinced this will map the declarations correctly but not the invocations.