Fixed a couple bugs with the latest system. Starting work on the 'big
items' system.