made some progress, commiting before my laptop blows up