Add Givex as a system

also clean up some code