Basic testing working and datatype mods