added more draft code/comments