Basic things working. Still ugly.