Commit

Organized code. Working on adding infusion and crap.