almost finished the core app