next version, will be cleanup and some syntax candy