added todo n shit