less bugs
phase i complete
adds a ton o stuff