Core functionality completed