Initial Attemp for issue #24... unit tests still broken