Added command line support, now just need to debug segfault.
-Frank