Second Commit

Clearing/clarification of mess