Clean base
added my changes
Added my own changes
Cleanup the mess I made earlier
Merging his changes
Streamlined encoding