98% Checkpoint
All functions working correctly

-- Clean up code for 100% --