Changed some stuff around for better organization.