More code and shit