Update
Update - most parts working now