Added Categories, needs bug fixing