ack stuff and timouts
Merge github.com:schafer14/CITS3230