Basic functionality back to normal
basic functionality complete
Update functionality