First commit hopefully, this is a struggle