Updated with sorta live code

For testing