Knight implementation 2

Everything is a lot nicer