preview work. in progress. and method cleanup