Another attempt at restructuring data/types. I AM LOST SEND HELP.