Correct Naming
Kinda functional
Mega commit working