0410 repack propdev 2 rebase

Please use this PR instead of #159 since I had to rebase.