done, left some redundant pieces and everything seems to be fine to me, will fix issues when found