MVP mostly done