Planning out some more features