Still rebasing and fixing shit from rebase