Added in removed code

Added in code that was removed by somebody else; i'm currently working
on these two features still.