Some cleaning up, still just Liam+Nina