Did most of the major features but still a few bug

gs