Cleaned up after myself a little. Still doesn't work though