All functions in place with bugs