Some work done. Not much

Mainly needed to update before laptop dies