Recomit since I reverted a while back :(

Can't figure it out! SO many hours wasted.