More things tested and working and stuff