Pubstwo 1080

I think I addressed all of the issues in the ticket.