new features! almost done!