Cleaned up the code, and a four-body example