First commit with some configurable stuff