Its a little screwed up now
Bug finally fixed