Hopefully Reconciling

Adding some stuff, hope it doesn't break everything!