Committed some stuff

Signed-off-by: jy2k <Jon@Jonathans-MacBook-Pro.local>