TODO: cleaned up duplicates, moved some tasks from uncategorized into