updated code (finished todos/etc) and added results