Started work on categories

Added better linking