- Add Handler and Loader
- Add initial tests