collision workinggit status! yaygit status!
going to merge, key fun bug still present