Re-arraned some things for coming redesign.