Added some more things. Really need to make this scalable.