Types updates... getting closer to functioning correctly...