Adding configurable params
Almost finished