Cleaned up code and separated concerns better
Fixed a bug where steps would end up being limited to 100