More functionality implemented. Only part left to do now really is letting
user choose the different categories.