Initial complete implementation without posting logs