Added a lot of stuff in an unorganized fashion