Converted everything to a more reasonable Clojure-style syntax. Still some possibly wonky stuff surrounding prefixed lists/vectors though ... not sure how to work with those quantities. The syntax also could be too verbose, but I suspect it will with some shorthands.