Updated with working things and stuff