MVP complete - with bugs