Added separate classes for a bunch of things