made some progress
made some more progress
funny merge