Continued work.

- Some work for Issue #2;
- Tests;
- Some refactoring.

Foreign Keys do not work right now.