introduced more bugs
added @todos