Made more progress :P