Updated, now fully functional, minus graphics