havent committed in a while. gonna make some changes soon too