Parted out the main class, and added a class for adjustable parameters