got everything working and cleaned up