polishing up codes
still having bugs
fix bugs
Messed up