Prototype works, clean it up now