Closes #2 the rest better have it on separate tickets, currently is a mess and needs to be rechecked separately