Some more code, and stuff