updates, almost working
TODO list