More significant changes made. Should prep for Arch migration