Refactored again
Add rendering functionality