Got most things working