half done
hack hack hack
ignore more
merge
quick fixes after merge mistakes