A bunch of changes to get this ready for prime time