First Commit from working offline
combine multiple efforts