Implemented Design
Bug Fixes