Registered the rest of the listeners and removed todo's and commented
out parts so it has no warning messages