Initial commit
Resolution logic roughed out.
Saving