Initial code commit
Updates, added some comments