More work

Adding functionality to ejections, incomplete, lunch break