started MVP implementation to clean up