Add categories and lots of other stuff :)