Add first take at full-complete functionality