move init to proper? place