Started: implementation of specs
Dev. checkpoint: File re-org.