A bit more stuff in, still not functional