Bit more progress

Not even close yet..