Completed TODO
Updated license