So many bug fixes, but there's more to come
add files