Core modification on author and adding some TODOS