Move user container to own file
Start adding in partial infection routine