More developmental stuff added.