Refactor
Add tests for 1A - A