Moved stuff around, added a little