Working version

Fixed stuff, now it's working