Fixed up versioning and added cli