Perfected fall and added todo's.