Added exercises etc, still need to debug