Making some progress

Still going insane though