- Finish manual - More error handling