New solution impl
Fix ponyunit