Updated, added A LOT of new stuff