ok finished i was too lazy to push any commits but here it is