More things, Should be working now