Major additions

Chat may be buggy still