Fix formatting, implement driver