added todos
converted kicker back to normal subsystem and fixed reset kicker