Changed up some architecture