Basic implementation, V2 enhancements upcoming