WIP - more progress on live system