Added a bunch of feature ideas