Everything is functional - just need more stats stuff