first round mikey
merged
errors fixed