Some more Work

next step will be to undo the lisp-ish lists since those unfortunately are slow on python