Finish module impl
Continue on block refactoring