WIP
Moving to reflect types instead of string checks