put Jack's class back together. Please REBASE BEFORE Committing from now on everyone!
put Jack's class back together. Please REBASE BEFORE Committing from now on everyone!

Koriganp/infrastructure,Koriganp/infrastructure,Koriganp/infrastructure,Koriganp/infrastructure