A whole bunch of additions from throughout the week, nothing is quite working yet, just a backup