Code is finished, need to fix compiler errors
Fixing more compiler errors