havent committed in a while
working stuff, time to clean
thanks for merge conflicting gibhub