final commit for tonight. This is working enough