Most functionality has been added
conflicts resolved