9th commit
Complete all functions without UI