More bugs
Semi Final Commit