WORKING COMMIT

Generally all functions should work