Implement basic feature
Fix typo, implement first TODO