Updated @todo's and moved boot order