Barely any progress

Still trying to find a good way to arrange things...