Moved all stuff over from Core that needs to be in here.