A little bit more organized now... at least similar things are together now