Added @overrides to make netbeans stop screaming
Updated TODO