More stuff, gonna work on it a bit more later.