Lots of changes, last push before removing smooth option