Getting it Right

finally getting these commits right. i think.