got everything working
final commit