Initial check ins

Cleanup