- Change structure for options - Add mergeOptions method to combine defaults with options - Rename stuff