Latest changes, all functionality implemented. Missing upload
capabilities.