Did some work, changed some things.. yeh im still commitin this way