UPDATED TODO!!! check it out