Issue #4, Partially Done.