Mostly solution related changes...I think