got more things working, almost there