WIP: Beta version release, still few TODOs