Rewrite previous Assembly Table commit

Yeah...there were better ways to do that...