workign on final touches