Commit 023

Looking much better.. not perfect, but better. Im going to call it done
for now. Possibly work on it tomorrow. Things still need fixing but I
just dont know how to fix them.