Added some DRAFT code