updated the state of the package, many #TODOs