Begins to add solving functionality