Initial code commit
Some clean up...