added tons of stuff, should be ready for first tests