More functionality, plus ending and twitter button