made some small changes, getting close to it’s final form