trying to do it all with one class (getting rid of Full...)