Categories still must be added and a few more things.