Got everything working. Might be done? Not very robust yet unfortunately.