Updates to Issue #13

Not entirely sure yet, looks like the server is taking a performance hit
from something.