Added atoi calls
Tests passing, TODO implement search tests