Still on progress
Merge https://github.com/kevinra/ECE497