made some changes and did some stuff.... yeah, also renamed controller