Refactored naming conventions
WORKING! now just tweaking the sign wave.