Clean these up a bit, make them require a command line argument so it's a bit easier for me to benchmark them
Kruft