fully functional, added tons