First commit

Needs organization and cleanup