added tons of new stuff