lots of stuff, committing early to get help with RMI stuff