wip - Added builder and init.