Updated

Most functionality now working (pseudo data at the moment).