Some more progress x]