Initial code commit
Improvements