Initial info commit
Initial code commit
Minor logic changes