Adds the function and number.of function
Fixes broken test
Begins fixing JSHint warnings