Some more changes, might have to look into doing some redesign