Much Re-org in prep of handling functions
Test Cases