Got a few things working properly